Auto merge of #1470 - alexcrichton:update, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 31 Mar 2015 16:31:44 +0000 (16:31 +0000)
committerbors <bors@rust-lang.org>
Tue, 31 Mar 2015 16:31:44 +0000 (16:31 +0000)
commit19008f5803c6a97c8f2fc47009000cd70868f67b
tree071528054392c010200de7cd439ea3481cad6587
parent72f2af145e753cb717764898f158ad71db4f855b
parent6e6dec8ab9071f47355ef12e7925aabfb9c2a42b
Auto merge of #1470 - alexcrichton:update, r=alexcrichton